Included the last conflict unit test