Conflicts fixing