gameplay balance and marker for ship position
consflicts resolved