fixes merge conflict
edits welcome page
fixes merge conflict