Delete and test for merge

Conflict? Yes = success