Commit to pull
Solved conflicts