Modify .gitignore to ignore nbproject
Resolve conflict