Tag: resolving conflicts effectively