1 files changed, 5 insertions, 0 deletions
diff --git a/nships.c b/nships.c
index d1a4984..216e3e0 100644
--- a/nships.c
+++ b/nships.c
@@ -187,8 +187,13 @@ struct ship setPlace(WINDOW * w, int len)
 				}
 				else {
 					s.dir = 0;
+<<<<<<< HEAD
+					if(s.p.x + s.len > ww - 5)
+						s.p.x = s.p.x - (s.p.x + s.len - ww) - 2;
+=======
 					if(s.p.x + s.len > ww - s.len)
 						s.p.x = s.p.x - (s.p.x + s.len - ww) - (s.len + 1);
+>>>>>>> origin/main
 				}
 				break;
 			case 10: