merge in sync changes