Tag: avoiding style of conflict resolution is based on