Merging config to master