Attempting to fix merge issues again