updating UI
Merging & updating windows-ifying line endings