Attempted to fix merge conflicts.