attempting to fix merge errors