Which of the following statements is/are correct regarding Vietnam?
1. It was ruled by France who gave up control in 1954.
2. After a civil war, it was the Geneva conference that settled this issue.
Select the correct answer using the codes given below: