Fixing further merge conflicts