resolve a conflicts issue.