merge comflict
merge
fix bug @ change rating of subject