remove tests from bad merge