Merging changes
Merge conflicts fixed