Trying to fix merge mess