A merge conflict adds <<<<<<< HEAD and >>>>>>> <branch id> markers. These markers make the filter parser fail.