update ignore file
merge