Feed issues got fixed
conflicts resolved