fixed question numbering
merging