Resolved conflict in TagTest