Adds logs to .gitignore
Removes logs
Resolves merge conflict
Removes logs