merge gallego changes