fixes merge conflict residues in FormatterTest.php