Fixing merge conflicts

merging's weird