fix conflicts in sync