corrected minor merge hiccup