sync for merge conflict solve