Fixing merge conflicts 1