Merge Conflict – Git tag