merge diffs from unicorn config
moved configs to yml