fix merge hiccup