Fixing merge conflicts
new