lo que sea yo
conflict resolved