Fixed .gitignore
Fixed conflict.