Added DependencyInjection to support Ebay Configuration
Fix Blank Lines
Fix Files in Conflict