better document resolving conflicts