adding full deep search
removing merge conflicts