Use merge=union for yaml files so we have less merge conflicts (#12851)
Use merge=union for yaml files so we have less merge conflicts (#12851)


ChristopherBiscardi/gatsby,ChristopherBiscardi/gatsby,gatsbyjs/gatsby,gatsbyjs/gatsby,ChristopherBiscardi/gatsby,gatsbyjs/gatsby,gatsbyjs/gatsby,ChristopherBiscardi/gatsby,gatsbyjs/gatsby,gatsbyjs/gatsby