Remove merge conflict notes from sass *facepalm*