sync and merge, further progress