HWHOOPS! Remove merge markers