Attempting to fix merge conflicts.