automatically rename question IDs whenever there is a conflict

+ a tiny bit of formatting cleanup