Resync after merge...