html change1
removed vim temp files
Conflict resolved with commit #570