Added conflict resolution for merges.