added changes
finished ratings
merging for conflicts
resolved merge conflicts