Resolv conflicts.