update ignore file
merge conflict
update vim tricks