rate funciton
conflict fix