scaffold for option and question

can you merge por favor