Resolving Conflict Quotes