Add a test for an invalid merge