Reacomodo en tex
Resolved conflicts
Resolved conflicts