fix merge buffoonery