Added logs to gitignore
fix conflicts