update conflict

app/Http/Controllers/ProjectController.php

@@ -344,6 +344,12 @@ class ProjectController extends Controller
 		return response()->json(['status'=>'success','code'=>200, 'data' => $data], 200);
   }
 
+//   testing
+  public function calculateSCurvetest(Request $request){
+	$data = MasterFunctionsHelper::calculateSCurve($request->project_id);
+	return response()->json(['status'=>'success','code'=>200, 'data' => $data], 200);
+}
+
   public function calculateSCurve(Request $request){
     $sCurve = Project::select('scurve')->where('id', $request->project_id)->first();
 		return response()->json(['status'=>'success','code'=>200, 'data' => json_decode($sCurve->scurve)], 200);