Trying to fix merge issues