remove pesky mergetool orig files
equipment search results
solve merge conflict