seller item and location list
merged and resolved conflicts