gitignore set up
fix merge conflict