Making a conflict part a