TEST: add test for fastforward merge to fail