ebay works
removed conflicts