Resovled merge conflict in mrss feeds