merge
merge fix,  UserParses in controller