fixed remove sunk ships issue
fixed conflicts