Guides/Webforms-Basic-Integration.md
... ...
@@ -60,21 +60,23 @@ You'll see conflicts for four files:
60 60
* Default.aspx - This file is simply a placeholder in Izenda. It redirects users to the ReportList page.
61 61
* Default.aspx.cs - This is the code file for the above page. It redirects users to the ReportList page.
62 62
63
-Keep NewWebsite's files, and discard the Izenda files.
63
+Keep NewWebsite's files, and discard the Izenda files. We will walk through merging the Global.asax files in the next step.
64 64
65 65
![misc files conflict](http://wiki.izenda.us/Guides/Webforms-Basic-Integration/2016-03-08-15_32_15-4-Total-File-Conflicts.png)
66 66
67
-We will walk through merging Izenda's Web.Config and Global.asax in the next step.
68
-
69 67
###Step 3. Merging the Global.asax
70 68
71 69
**a.** Open the Izenda Global.asax and the NewWebsite Global.asax and add the Izenda namespace.
72 70
73
-![Controllers](http://wiki.izenda.us/Guides/Webforms-Basic-Integration/2016-03-08-19_23_05-NewWebsite---Microsoft-Visual-Studio.png)
71
+![1245125](http://wiki.izenda.us/Guides/Webforms-Basic-Integration/2016-03-08-19_23_05-NewWebsite---Microsoft-Visual-Studio.png)
74 72
75 73
**b.** Add Izenda's CustomAdHocConfig class.
76 74
77
-![Controllers](http://wiki.izenda.us/Guides/Webforms-Basic-Integration/2016-03-08-19_26_47-NewWebsite---Microsoft-Visual-Studio.png)
75
+![125612](http://wiki.izenda.us/Guides/Webforms-Basic-Integration/2016-03-08-19_26_47-NewWebsite---Microsoft-Visual-Studio.png)
76
+
77
+**c.** If you haven't done so already, empty the contents of your Izenda.config (or leave it out of the merge process entirely) and set your license key and connection string in the InitializeReporting() method.
78
+
79
+![534512](http://wiki.izenda.us/Guides/Webforms-Basic-Integration/2016-03-08-15_44_50-NewWebsite---Microsoft-Visual-Studio.png)
78 80
79 81
###Step 4. Set Friendly URL Redirect Mode to Off
80 82
... ...
@@ -82,7 +84,7 @@ In order to avoid routing issues, you'll need to set the RedirectMode to off. Op
82 84
83 85
![Controllers](http://wiki.izenda.us/Guides/Webforms-Basic-Integration/2016-03-08-19_34_37-NewWebsite---Microsoft-Visual-Studio.png)
84 86
85
-###Step 5. Set Friendly URL Redirect Mode to Off
87
+###Step 5.
86 88
87 89
In order to avoid routing issues, set the RedirectMode to off, as seen below.
88 90