Add log folder to gitignore, remove all old logs
Fix conflict logs/