git ignore merge conflict
git ignore merge conflict