Resolved merge conflict with acts-as-taggable