Archive Tag: resolve conflict