ignore netrwhist file
merge