add newrebasefile to generate conflict while rebase