remove form1, add question_set 1 to form 2
remove form1, add question_set 1 to form 2
resolve conflict