Used pods own function to merge topics and feeds to resource
Merge branch 'dev'