Attempting to fix merge issues