Sync after merge