fix couple of merge conflicts I missed