RP-1820: completada tarea
fix merge conflicts