diff --git a/.env.example b/.env.example
index f987921..8e7575b 100644
--- a/.env.example
+++ b/.env.example
@@ -45,3 +45,6 @@ SYSTEM_EMAIL_ADDRESS="REPLACE_ME"
 
 # System Email Name
 SYSTEM_EMAIL_NAME="REPLACE_ME"
+
+# Testing Email Adress
+TEST_EMAIL_ADDRESS="REPLACE_ME"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2633a1..ea07c65 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 0.1.3.2 - 2019-05-14
+
+## Added
+
+- Adds: setup script requires the developers email address and sets it as the `testToEmailAddress` in `general.php`
+
+## Fixed
+
+- Fixes: outstanding merge conflict issue from the previous release
+
 ## 0.1.3.1 - 2019-05-14
 
 ### Added
diff --git a/build-tools/setup/questions.js b/build-tools/setup/questions.js
index 63832f7..30ef86a 100644
--- a/build-tools/setup/questions.js
+++ b/build-tools/setup/questions.js
@@ -24,7 +24,7 @@ module.exports = {
                 name: 'defaultUrl',
                 type: 'input',
                 message: 'Site URL:',
-                default: `${ projectName.replace(' ', '-').toLowerCase() }.local`,
+                default: `${ projectName.replace(/\s/g, '-').toLowerCase() }.local`,
                 validate: (input)=>{
                     if(input !== ''){
                         if(input.match(/http:\/\//)){
@@ -35,6 +35,22 @@ module.exports = {
                     }
                     return 'Please enter a project URL.';
                 }
+            },
+            {
+                name: 'devEmailAddress',
+                type: 'input',
+                message: 'Your Email Address:',
+                default: `web@page.works`,
+                validate: (input)=>{
+                    if(input !== ''){
+                        if(input.match(/.+@.+\..+/)){
+                            return 'Please provide a valid email address.';
+                        }else{
+                            return true;
+                        }
+                    }
+                    return 'Please enter your email address.';
+                }
             }
         ];
 
@@ -96,7 +112,7 @@ module.exports = {
                 name: 'database',
                 type: 'input',
                 message: 'Database name:',
-                default: `craft_${ projectName.replace(' ', '-').toLowerCase() }`,
+                default: `craft_${ projectName.replace(/\s/g, '-').toLowerCase() }`,
                 validate: (input)=>{
                     if(input !== ''){
                         return true;
@@ -108,4 +124,4 @@ module.exports = {
 
         return inquirer.prompt(questions);
     }
-}
\ No newline at end of file
+}
diff --git a/build-tools/setup/setup.js b/build-tools/setup/setup.js
index 8faf6ff..3e7702f 100644
--- a/build-tools/setup/setup.js
+++ b/build-tools/setup/setup.js
@@ -28,6 +28,7 @@ askQuestions = (async ()=>{
 
     const question2 = await questions.getProjectURL(projectDetails.projectName);
     projectDetails.devUrl = `${ question2.defaultUrl }`;
+    projectDetails.devEmail = devEmailAddress;
 
     const question3 = await questions.getDatabaseDetails(projectDetails.projectName);
     projectDetails.driver = question3.driver;
@@ -80,6 +81,7 @@ askQuestions = (async ()=>{
             modifiedFile = modifiedFile.replace(/SYSTEM_NAME="REPLACE_ME"/, `SYSTEM_NAME="${ projectDetails.projectName }"`);
             modifiedFile = modifiedFile.replace(/SYSTEM_EMAIL_NAME="REPLACE_ME"/, `SYSTEM_EMAIL_NAME="${ projectDetails.projectName }"`);
             modifiedFile = modifiedFile.replace(/SYSTEM_EMAIL_ADDRESS="REPLACE_ME"/, `SYSTEM_EMAIL_ADDRESS="no-reply@${ projectDetails.devUrl }"`);
+            modifiedFile = modifiedFile.replace(/TEST_EMAIL_ADDRESS="REPLACE_ME"/, `TEST_EMAIL_ADDRESS="${ projectDetails.devEmail }"`);
 
             fs.writeFile('.env', modifiedFile, (err)=>{
                 if(err){
diff --git a/config/general.php b/config/general.php
index be73534..3864b93 100755
--- a/config/general.php
+++ b/config/general.php
@@ -26,13 +26,8 @@
         'useProjectConfigFile'          => true,
 
         // Leave at bottom of global settings
-<<<<<<< HEAD
-        'jsCacheBustTimestamp' => '53210445',
-        'cssCacheBustTimestamp' => '53211169',
-=======
-        'jsCacheBustTimestamp' => '53210445',
-        'cssCacheBustTimestamp' => '53211169',
->>>>>>> develop
+        'jsCacheBustTimestamp' => '54654843',
+        'cssCacheBustTimestamp' => '54655693',
     ],
 
     // Dev environment settings
@@ -41,7 +36,7 @@
         'siteUrl'               => getenv('DEV_URL'),
         'allowUpdates'          => true,
         'devMode'               => true,
-        'testToEmailAddress'    => 'REPLACE_ME',
+        'testToEmailAddress'    => getenv('TEST_EMAIL_ADDRESS'),
         'enableTemplateCaching' => false,
         'aliases' => [
             '@rootUrl' => getenv('DEV_URL'),
diff --git a/public/assets/scripts/application.53210445.js b/public/assets/scripts/application.54654843.js
similarity index 100%
rename from public/assets/scripts/application.53210445.js
rename to public/assets/scripts/application.54654843.js
diff --git a/public/assets/scripts/env.53210445.js b/public/assets/scripts/env.54654843.js
similarity index 100%
rename from public/assets/scripts/env.53210445.js
rename to public/assets/scripts/env.54654843.js
diff --git a/public/assets/scripts/globals.53210445.js b/public/assets/scripts/globals.54654843.js
similarity index 100%
rename from public/assets/scripts/globals.53210445.js
rename to public/assets/scripts/globals.54654843.js
diff --git a/public/assets/scripts/module.53210445.js b/public/assets/scripts/module.54654843.js
similarity index 100%
rename from public/assets/scripts/module.53210445.js
rename to public/assets/scripts/module.54654843.js
diff --git a/public/assets/scripts/npm.pageworks.53210445.js b/public/assets/scripts/npm.pageworks.54654843.js
similarity index 100%
rename from public/assets/scripts/npm.pageworks.53210445.js
rename to public/assets/scripts/npm.pageworks.54654843.js
diff --git a/public/assets/scripts/npm.uuid.53210445.js b/public/assets/scripts/npm.uuid.54654843.js
similarity index 100%
rename from public/assets/scripts/npm.uuid.53210445.js
rename to public/assets/scripts/npm.uuid.54654843.js
diff --git a/public/assets/scripts/runtime.53210445.js b/public/assets/scripts/runtime.54654843.js
similarity index 100%
rename from public/assets/scripts/runtime.53210445.js
rename to public/assets/scripts/runtime.54654843.js
diff --git a/public/assets/styles/button.53211169.css b/public/assets/styles/button.54655693.css
similarity index 100%
rename from public/assets/styles/button.53211169.css
rename to public/assets/styles/button.54655693.css
diff --git a/public/assets/styles/container.53211169.css b/public/assets/styles/container.54655693.css
similarity index 100%
rename from public/assets/styles/container.53211169.css
rename to public/assets/styles/container.54655693.css
diff --git a/public/assets/styles/fonts.53211169.css b/public/assets/styles/fonts.54655693.css
similarity index 100%
rename from public/assets/styles/fonts.53211169.css
rename to public/assets/styles/fonts.54655693.css
diff --git a/public/assets/styles/grid.53211169.css b/public/assets/styles/grid.54655693.css
similarity index 100%
rename from public/assets/styles/grid.53211169.css
rename to public/assets/styles/grid.54655693.css
diff --git a/public/assets/styles/heading.53211169.css b/public/assets/styles/heading.54655693.css
similarity index 100%
rename from public/assets/styles/heading.53211169.css
rename to public/assets/styles/heading.54655693.css
diff --git a/public/assets/styles/homepage.53211169.css b/public/assets/styles/homepage.54655693.css
similarity index 100%
rename from public/assets/styles/homepage.53211169.css
rename to public/assets/styles/homepage.54655693.css
diff --git a/public/assets/styles/main.53211169.css b/public/assets/styles/main.54655693.css
similarity index 100%
rename from public/assets/styles/main.53211169.css
rename to public/assets/styles/main.54655693.css
diff --git a/public/assets/styles/ratio.53211169.css b/public/assets/styles/ratio.54655693.css
similarity index 100%
rename from public/assets/styles/ratio.53211169.css
rename to public/assets/styles/ratio.54655693.css
diff --git a/public/assets/styles/spacing.53211169.css b/public/assets/styles/spacing.54655693.css
similarity index 100%
rename from public/assets/styles/spacing.53211169.css
rename to public/assets/styles/spacing.54655693.css
diff --git a/public/assets/styles/utility.53211169.css b/public/assets/styles/utility.54655693.css
similarity index 100%
rename from public/assets/styles/utility.53211169.css
rename to public/assets/styles/utility.54655693.css
diff --git a/public/assets/styles/widths.53211169.css b/public/assets/styles/widths.54655693.css
similarity index 100%
rename from public/assets/styles/widths.53211169.css
rename to public/assets/styles/widths.54655693.css
diff --git a/public/assets/styles/wrapper.53211169.css b/public/assets/styles/wrapper.54655693.css
similarity index 100%
rename from public/assets/styles/wrapper.53211169.css
rename to public/assets/styles/wrapper.54655693.css