diff --git a/gulp-options.js b/gulp-options.js
index e10c5d4..a3db0f1 100644
--- a/gulp-options.js
+++ b/gulp-options.js
@@ -8,7 +8,11 @@
     'srcFolderPath': './app',
     'tempFolderPath': __dirname + '/.temp',
     'nodeModulesFolderPath': './node_modules',
+<<<<<<< HEAD
 	'bowerFolderPath': __dirname + '/bower_components',
+=======
+	'bowerFolderPath': './app/bower_components',
+>>>>>>> 4c1a3dd... Major update to code structure
     'dirname': __dirname,
     'excludePath': '!./app/vendors/**/*'
 };