Conflicted Change Test

Test for conflicted changes