Se agrega el conected user
Resolviendo merge conflicts