resolved conflict in config
resolved conflict in config