Update v1.raml
resolwe conflicts