Fixed unresolved Merge-Conflicts in Tag2