merge master and search