Resolved acts_as_taggable merge conflicts in models.