Fix for what seems like merge conflict markers not getting removed