Solo comiteando lo necesario
Merge branch 'local', remote-tracking branch 'origin' into development