Fixes syntax error due to git conflit markers being present after incomplete merge.