slove PR conflict