merged sync fix