fixed camera_para.ui problem
fixed merge problem