Still trying to fix merge