fix merge with 40_restructure_project