merge error
merge error fix
merge error fix
encapsulation shipplacementstate