fix
fix
fix merge error
cleaning up in shipplacementstate