???

borrados los "<<<<<<< HEAD", "=======", ">>>>>>> origin/master"...