sua lai conflct main scene

///