making a conflict 2