configuration file
merging with origin