sync after merge