Arreglos post fks
Fixing merge