Dont replace the whole category, only the questions..
Merge remote-tracking branch 'upstream/master'