Working commit, group message search is working
Fix merge conflict