adding storefront as context root
resolved conflicts