changres
chnages
logic done ratings
conflict removed