deleted .netrwhist
fixing conflict