made a conflict method