Fix yaml merge