Fixed link mapping to submit question button in Category pages
Fixed merge conflict