fix merge
readme
config.json