Tagged: how to resolve conflict