Tag: how to resolve conflict