Github and git conflict

Github and git

Jeremy Cavallo gw2918