fixed fixItemOnMap
fixed merge conflicts