Commit to pull
commit tu pull
Commit to merge
Solved conflicts