gitignore changes
user name instead of email sitewide
user name instead of email sitewide
solved conflict