Fix conflicts I missed

See #297.