Attempt to fix merge #2