fixed sync conflicts