commit
Merge conflicts solved