pushing files that should had been pushed in previous 2 commits
trying to add the merged file search.java