add following users & patient search
fix merge conlits