merge conflict and daitai almost completed making select page