Handle conf file & fix git config