changes to yml
merge fix