Fix conflicts I missed