Added _conflict file to ignore list
Removed unused files
Refactored welcomePage classes to h1 and h2