udpate .gitignore
fix merge conflicts