sync config files
resolve merge