misc: resolving conflicts to merge