add gitignore file
update gitignore file
fix merge conflict with gitignore