sync with merges