initial commit to add all the config files
conflict resolved