Changed conflict to Conflict 2