adding new pages conflict

replaced done search-results.html with one unfinished one from some
other state