cleanup of some merge conflicts