fixing some merge conflict broken-ness