Preparing to merge changes with origin
Merge conflicts resolved