Fixed a merge hiccup