Fixes in reply & new feed
Merge Confilct