Merging
Fixing merge conflicts