add a test for 'got merge' which covers a no-op merge situation