detalles
commit after conflicts