manual sync after merge