fixed merge hiccup