fix rspec naming
fix merge conflict
generate model for Likes