Working on evalution section.
Fix merge conflict and update .gitignore.