Pre-merge commit
Resovled merge conflicts