diff --git a/public/react/src/App.js b/public/react/src/App.js
index a592d1c77..d3994b9a4 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -334,8 +334,6 @@ class App extends Component {
 
 		initAxiosInterceptors(this.props);
 		this.getAppdata();
-<<<<<<< HEAD
-=======
 		//
 		// axios.interceptors.response.use((response) => {
 		// 	// console.log("response"+response);
@@ -350,7 +348,6 @@ class App extends Component {
 		// }, (error) => {
 		// 	//TODO 这里如果样式变了会出现css不加载的情况
 		// });
->>>>>>> a190075... 实训增加搜索并调整新增
 
 		window.addEventListener('error', (event) => {
 			const msg = `${event.type}: ${event.message}`;
@@ -398,11 +395,8 @@ class App extends Component {
 	getAppdata = () => {
 		let url = "/setting.json";
 		axios.get(url).then((response) => {
-<<<<<<< HEAD
-=======
 			// console.log("app.js开始请求/setting.json");
 			// console.log("获取当前定制信息");
->>>>>>> a190075... 实训增加搜索并调整新增
 			if (response) {
 				if (response.data) {
 					this.setState({
@@ -440,43 +434,6 @@ class App extends Component {
 	};
 
 	render() {
-<<<<<<< HEAD
-		return (
-			<Provider store={store}>
-				<ConfigProvider locale={zhCN}>
-
-					<Accountnewprofile {...this.props}{...this.state} />
-					<LoginDialog {...this.props} {...this.state} Modifyloginvalue={() => this.Modifyloginvalue()}></LoginDialog>
-					<Notcompletedysl {...this.props} {...this.state}></Notcompletedysl>
-					<Trialapplicationysl  {...this.props} {...this.state}></Trialapplicationysl>
-					<Trialapplicationreview  {...this.props} {...this.state}></Trialapplicationreview>
-					<Addcourses {...this.props} {...this.state} HideAddcoursestypess={(i) => this.HideAddcoursestypess(i)} />
-					<AccountProfile {...this.props} {...this.state} />
-					<Certifiedprofessional {...this.props} {...this.state} ModalCancelsy={this.ModalCancelsy} ModalshowCancelsy={this.ModalshowCancelsy} />
-					<Router>
-						<Switch>
-
-							{/*题库*/}
-							<Route path="/topicbank/:username/:topicstype"
-								render={
-									(props) => {
-
-										return (<Topicbank {...this.props} {...props} {...this.state} />)
-									}
-								}></Route>
-							{/*题库*/}
-							<Route path="/topicbank/:topicstype"
-								render={
-									(props) => {
-
-										return (<Topicbank {...this.props} {...props} {...this.state} />)
-									}
-								}></Route>
-							{/*竞赛*/}
-							<Route path={"/competitions"}
-								render={
-									(props) => {
-=======
 		let { mygetHelmetapi } = this.state;
 		// console.log("appappapp");
 		// console.log(mygetHelmetapi);
@@ -601,87 +558,11 @@ class App extends Component {
 									path="/changepassword"
 									render={
 										(props) => {
->>>>>>> a190075... 实训增加搜索并调整新增
 
 										return (<NewCompetitions {...this.props} {...props} {...this.state} />)
 									}
 								}></Route>
 
-<<<<<<< HEAD
-							{/*黑客松定制竞赛*/}
-							<Route
-								path={"/osshackathon"}
-								render={
-									(props) => {
-										return (
-											<Osshackathon {...this.props} {...props} {...this.state} />
-										)
-									}
-								}
-							/>
-
-							{/*认证*/}
-							<Route path="/account" component={AccountPage} />
-
-							{/*403*/}
-							<Route path="/403" component={Shixunauthority} />
-
-							<Route path="/500" component={http500} />
-
-							{/*404*/}
-							<Route path="/nopage" component={Shixunnopage} />
-
-							<Route path="/compatibility" component={CompatibilityPageLoadable} />
-							<Route
-								path="/login"
-								render={
-									(props) => {
-
-										return (<EducoderLogin {...this.props} {...props} {...this.state} />)
-									}
-								}
-							/>
-							<Route
-								path="/register"
-								render={
-									(props) => {
-
-										return (<EducoderLogin {...this.props} {...props} {...this.state} />)
-									}
-								}
-							/>
-							<Route
-								path="/otherloginstart" component={Otherloginstart}
-							/>
-							<Route
-								path={"/otherloginqq"} component={Otherloginsqq}
-							/>
-							<Route
-								path="/otherlogin" component={Otherlogin}
-							/>
-							<Route
-								path="/loginqq" component={Loginqq}
-							/>
-
-							<Route path="/users/:username"
-								render={
-									(props) => {
-
-										return (<InfosIndex {...this.props} {...props} {...this.state} />)
-									}
-								}></Route>
-
-							<Route path="/banks"
-								render={
-									(props) => {
-										return (<BanksIndex {...this.props} {...props} {...this.state} />)
-									}
-								}></Route>
-							<Route
-								path="/changepassword"
-								render={
-									(props) => {
-=======
 								{/*/>*/}
 								<Route path="/shixuns/new" component={Newshixuns}>
 								</Route>
@@ -762,7 +643,6 @@ class App extends Component {
 									render={
 										(props) => (<Ecs {...this.props} {...props} {...this.state}></Ecs>)
 									} />
->>>>>>> a190075... 实训增加搜索并调整新增
 
 										return (<EducoderLogin {...this.props} {...props} {...this.state} />)
 									}
@@ -815,22 +695,22 @@ class App extends Component {
 									} />
 
 								<Route path="/myproblems/:id/:tab?"
-									render={
-										(props) => (<StudentStudy  {...this.props} {...props} {...this.state} />)
-									} />
-								<Route path="/question/edit/:id"
-									render={
-										(props) => (<Questionitem_banks  {...this.props} {...props} {...this.state} />)
-									} />
-
-								<Route path="/question/newitem"
-									render={
-										(props) => (<Questionitem_banks  {...this.props} {...props} {...this.state} />)
-									} />
-								<Route path="/question/:type"
-									render={
-										(props) => (<Headplugselection  {...this.props} {...props} {...this.state} />)
-									} />
+											 render={
+												 (props) => (<StudentStudy  {...this.props} {...props} {...this.state} />)
+											 } />
+								<Route path="/problemset/edit/:id"
+											 render={
+												 (props) => (<Questionitem_banks  {...this.props} {...props} {...this.state} />)
+											 } />
+
+								<Route path="/problemset/newitem"
+											 render={
+												 (props) => (<Questionitem_banks  {...this.props} {...props} {...this.state} />)
+											 } />
+								<Route path="/problemset/:type"
+											 render={
+												 (props) => (<Headplugselection  {...this.props} {...props} {...this.state} />)
+											 } />
 								<Route path="/paperlibrary"
 									render={
 										(props) => (<Testpaperlibrary  {...this.props} {...props} {...this.state} />)
@@ -846,10 +726,10 @@ class App extends Component {
 										(props) => (<Developer  {...this.props} {...props} {...this.state} />)
 									} />
 
-								<Route path="/question"
-									render={
-										(props) => (<Headplugselection  {...this.props} {...props} {...this.state} />)
-									} />
+								<Route path="/problemset"
+											 render={
+												 (props) => (<Headplugselection  {...this.props} {...props} {...this.state} />)
+											 }/>
 								{/*<Route path="/wxcode/:identifier?" component={WXCode}*/}
 								{/*	render={*/}
 								{/*		(props)=>(<WXCode {...this.props} {...props} {...this.state}></WXCode>)*/}