public announcement search
handle merge conflict