Guides/Webforms-Basic-Integration.md
... ...
@@ -49,15 +49,19 @@ You will get a conflict around the NewtonJSON DLL. Either use the Izenda NewtonJ
49 49
50 50
![misc files](http://wiki.izenda.us/Guides/Webforms-Basic-Integration/2016-03-08-15_29_22-webforms-cs.png)
51 51
52
-You'll see conflicts for four files. Keep NewWebsite's files, and discard the Izenda files. We will walk through merging Izenda's Web.Config and Global.asax in the next step.
53
-
54
-![misc files conflict](http://wiki.izenda.us/Guides/Webforms-Basic-Integration/2016-03-08-15_32_15-4-Total-File-Conflicts.png)
52
+You'll see conflicts for four files:
55 53
56 54
* Web.Config - This will contain basic web application configuration settings.
57 55
* Global.asax -This crucial for InitializeReporting() method and AdHocConfig class.
58 56
* Default.aspx - This file is simply a placeholder in Izenda. It redirects users to the ReportList page.
59 57
* Default.aspx.cs - This is the code file for the above page. It redirects users to the ReportList page.
60 58
59
+Keep NewWebsite's files, and discard the Izenda files.
60
+
61
+![misc files conflict](http://wiki.izenda.us/Guides/Webforms-Basic-Integration/2016-03-08-15_32_15-4-Total-File-Conflicts.png)
62
+
63
+We will walk through merging Izenda's Web.Config and Global.asax in the next step.
64
+
61 65
###Step 3. Add IzendaStaticResourcesController.cs and IzendaReportingController.cs to the project
62 66
63 67
IzendaStaticResourcesController.cs and IzendaReportingController.cs are at mvc5r3\Controllers. Add them under Controllers as below (You can add by either 'drag and drop' or 'right click->Add->Existing Item)