conflict player2
conflict resolution