new develop
add gitignore
over
fix conflict