Renamed config.bk to config
conflict fix
added files