fixing sync merges