Quotes on yml values that include colons
Resolving merge conflict