correct conflict
update gitignore