Resolving conflicts Quotes