Fixing merge conflicts #2