add gitignore
fix merge conflicts