change .netrwhist
add gitignore
merge