added git config files and solved merge conflicts