Fixing some merge conflicts