Fix merge conflict in TaggingsController