changed branding of repo
resolved conflict