Fix merge conflicts I missed