fix styling problems from rebasing