fix merge mishap