Added pending test for dealing with conflicts