attempting to fix merge bug