Added create-Conflict method