Quitando merge conflict