add 3_ 1
try to fix conflict and update .gitignore