init
removed old conf
Screenshot
Merge remote-tracking branch 'origin/master'