Fixing merge conflicts

Updating this due to weird merge conflicts..