edit event api
change khanh branch
Process conflict user  model