Tag: how to deal with conflict