HOTFIX: Arregle tal cosa
Fixing rebase conflicts