Tag: how to effectively resolve conflict