Attempted to fix merge conflict