fix merge fail #99