diff --git a/src/main/resources/bitrock/alfresco-customstack-build-settings.xml b/src/main/resources/bitrock/alfresco-customstack-build-settings.xml
index 8b84c7113a..a11ce3aa85 100644
--- a/src/main/resources/bitrock/alfresco-customstack-build-settings.xml
+++ b/src/main/resources/bitrock/alfresco-customstack-build-settings.xml
@@ -5,6 +5,7 @@
     <preBuildActionList>
         <!-- ALFRESCO BUILD SYSTEM-->
         <actionGroup>
+<<<<<<< .working
             <actionList>
                 <!-- AlfrescoDM build settings -->
                 <!-- NOTE: licenses directory should also include the licenses provided by BitRock -->
@@ -29,7 +30,7 @@
                 <setInstallerVariable name="alfresco_awe_config_source_file" value="${wcmqs_folder.unix}/alfresco"/>
                 <setInstallerVariable name="alfresco_wcmqs_config_source_file" value="${wcmqs_folder.unix}/alfresco"/>
                 <!-- Binaries -->
-                <setInstallerVariable name="manager_distribution_folder" value="${binaries_folder}/manager"/>
+                <setInstallerVariable name="manager_distribution_folder" value="${local_binaries_folder}/manager"/>
                 <setInstallerVariable name="common_distribution_folder" value="${local_binaries_folder}/common"/>
                 <setInstallerVariable name="postgres_distribution_folder" value="${local_binaries_folder}/postgresql"/>
                 <setInstallerVariable name="imagemagick_distribution_folder_windows" value="${local_binaries_folder}/ImageMagick"/>
@@ -43,6 +44,101 @@
             <ruleList>
                 <stringTest text="${alfresco_distribution_folder}" type="empty" negate="yes" />
             </ruleList>
+||||||| .merge-left.r127157
+        <actionList>
+        <!-- AlfrescoDM build settings -->
+        <!-- NOTE: licenses directory should also include the licenses provided by BitRock -->
+
+        <setInstallerVariable name="alfresco_extensions_source_directory" value="${distribution_folder.unix}/web-server/shared/classes" />
+        <setInstallerVariable name="alfresco_lib_source_directory" value="${distribution_folder.unix}/web-server/lib" />
+        <setInstallerVariable name="alfresco_endorsed_source_directory" value="${distribution_folder.unix}/web-server/endorsed" />
+        <setInstallerVariable name="alfresco_war_source_directory" value="${distribution_folder.unix}/web-server/webapps" />
+        <setInstallerVariable name="alfresco_licenses_directory" value="${distribution_folder.unix}/licenses" />
+        <setInstallerVariable name="alfresco_readme_source_directory" value="${distribution_folder.unix}" />
+        <setInstallerVariable name="alfresco_on_install_settings_directory" value="${build_project_directory.unix}/bitrock" />
+
+        <setInstallerVariable name="alfresco_mmt_source_file" value="${distribution_folder.unix}/bin/alfresco-mmt.jar" />
+
+
+        <setInstallerVariable name="alfresco_commands_source_directory" value="${distribution_folder.unix}/bin" />
+        <setInstallerVariable name="alfresco_solr_source_directory" value="${distribution_folder.unix}/alf_data/solr" />
+        <setInstallerVariable name="alfresco_solr4_source_directory" value="${distribution_folder.unix}/solr4" />
+        <setInstallerVariable name="alfresco_keystore_source_directory" value="${distribution_folder.unix}/alf_data/keystore" />
+        <setInstallerVariable name="alfresco_sharepoint_source_file" value="${distribution_folder.unix}/amps/alfresco-spp.amp" />
+        <setInstallerVariable name="alfresco_sharepoint_on_install_settings_directory" value="${build_project_directory.unix}/bitrock/alfrescosharepoint" />
+
+
+        <setInstallerVariable name="alfresco_wcmqs_source_file" value="${wcmqs_folder.unix}/alfresco-wcmqs.amp" />
+        <setInstallerVariable name="alfresco_wcmqs_share_source_file" value="${wcmqs_folder.unix}/alfresco-wcmqs-share.amp" />
+        <setInstallerVariable name="alfresco_wcmqs_war_source_file" value="${wcmqs_folder.unix}/wcmqs.war" />
+        <setInstallerVariable name="alfresco_awe_war_source_file" value="${wcmqs_folder.unix}/awe.war" />
+        <setInstallerVariable name="alfresco_awe_config_source_file" value="${alfresco_svn_rootdir.unix}/modules/wcmquickstart/wcmquickstartwebsite/config/alfresco" />
+        <setInstallerVariable name="alfresco_wcmqs_config_source_file" value="${alfresco_svn_rootdir.unix}/modules/wcmquickstart/wcmquickstartclientapi/config/alfresco" />
+
+        <!-- Binaries -->
+        <setInstallerVariable name="manager_distribution_folder" value="${binaries_folder}/manager" />
+        <setInstallerVariable name="common_distribution_folder" value="${local_binaries_folder}/common" />
+        <setInstallerVariable name="postgres_distribution_folder" value="${local_binaries_folder}/postgresql" />
+        <setInstallerVariable name="imagemagick_distribution_folder_windows" value="${binaries_folder}/ImageMagick-6.8.6-gs8.64" />
+        <setInstallerVariable name="imagemagick_distribution_folder_unix" value="${binaries_folder}/ImageMagick-6.8.6-gs8.64" />
+        <setInstallerVariable name="java_distribution_folder" value="${local_binaries_folder}/java" />
+        <setInstallerVariable name="libreoffice_distribution_folder" value="${local_binaries_folder}/libreoffice" />
+        <setInstallerVariable name="swftools_distribution_folder" value="${binaries_folder}/swftools-0.9.2" />
+        <setInstallerVariable name="tomcat_distribution_folder" value="${local_binaries_folder}/apache-tomcat" />
+
+        <!-- END ALFRESCO BUILD SYSTEM-->
+        </actionList>
+        <ruleList>
+            <stringTest text="${alfresco_svn_rootdir}" type="empty" negate="yes" />
+        </ruleList>
+=======
+        <actionList>
+        <!-- AlfrescoDM build settings -->
+        <!-- NOTE: licenses directory should also include the licenses provided by BitRock -->
+
+        <setInstallerVariable name="alfresco_extensions_source_directory" value="${distribution_folder.unix}/web-server/shared/classes" />
+        <setInstallerVariable name="alfresco_lib_source_directory" value="${distribution_folder.unix}/web-server/lib" />
+        <setInstallerVariable name="alfresco_endorsed_source_directory" value="${distribution_folder.unix}/web-server/endorsed" />
+        <setInstallerVariable name="alfresco_war_source_directory" value="${distribution_folder.unix}/web-server/webapps" />
+        <setInstallerVariable name="alfresco_licenses_directory" value="${distribution_folder.unix}/licenses" />
+        <setInstallerVariable name="alfresco_readme_source_directory" value="${distribution_folder.unix}" />
+        <setInstallerVariable name="alfresco_on_install_settings_directory" value="${build_project_directory.unix}/bitrock" />
+
+        <setInstallerVariable name="alfresco_mmt_source_file" value="${distribution_folder.unix}/bin/alfresco-mmt.jar" />
+
+
+        <setInstallerVariable name="alfresco_commands_source_directory" value="${distribution_folder.unix}/bin" />
+        <setInstallerVariable name="alfresco_solr_source_directory" value="${distribution_folder.unix}/alf_data/solr" />
+        <setInstallerVariable name="alfresco_solr4_source_directory" value="${distribution_folder.unix}/solr4" />
+        <setInstallerVariable name="alfresco_keystore_source_directory" value="${distribution_folder.unix}/alf_data/keystore" />
+        <setInstallerVariable name="alfresco_sharepoint_source_file" value="${distribution_folder.unix}/amps/alfresco-spp.amp" />
+        <setInstallerVariable name="alfresco_sharepoint_on_install_settings_directory" value="${build_project_directory.unix}/bitrock/alfrescosharepoint" />
+
+
+        <setInstallerVariable name="alfresco_wcmqs_source_file" value="${wcmqs_folder.unix}/alfresco-wcmqs.amp" />
+        <setInstallerVariable name="alfresco_wcmqs_share_source_file" value="${wcmqs_folder.unix}/alfresco-wcmqs-share.amp" />
+        <setInstallerVariable name="alfresco_wcmqs_war_source_file" value="${wcmqs_folder.unix}/wcmqs.war" />
+        <setInstallerVariable name="alfresco_awe_war_source_file" value="${wcmqs_folder.unix}/awe.war" />
+        <setInstallerVariable name="alfresco_awe_config_source_file" value="${alfresco_svn_rootdir.unix}/modules/wcmquickstart/wcmquickstartwebsite/config/alfresco" />
+        <setInstallerVariable name="alfresco_wcmqs_config_source_file" value="${alfresco_svn_rootdir.unix}/modules/wcmquickstart/wcmquickstartclientapi/config/alfresco" />
+
+        <!-- Binaries -->
+        <setInstallerVariable name="manager_distribution_folder" value="${local_binaries_folder}/manager" />
+        <setInstallerVariable name="common_distribution_folder" value="${local_binaries_folder}/common" />
+        <setInstallerVariable name="postgres_distribution_folder" value="${local_binaries_folder}/postgresql" />
+        <setInstallerVariable name="imagemagick_distribution_folder_windows" value="${binaries_folder}/ImageMagick-6.8.6-gs8.64" />
+        <setInstallerVariable name="imagemagick_distribution_folder_unix" value="${binaries_folder}/ImageMagick-6.8.6-gs8.64" />
+        <setInstallerVariable name="java_distribution_folder" value="${local_binaries_folder}/java" />
+        <setInstallerVariable name="libreoffice_distribution_folder" value="${local_binaries_folder}/libreoffice" />
+        <setInstallerVariable name="swftools_distribution_folder" value="${binaries_folder}/swftools-0.9.2" />
+        <setInstallerVariable name="tomcat_distribution_folder" value="${local_binaries_folder}/apache-tomcat" />
+
+        <!-- END ALFRESCO BUILD SYSTEM-->
+        </actionList>
+        <ruleList>
+            <stringTest text="${alfresco_svn_rootdir}" type="empty" negate="yes" />
+        </ruleList>
+>>>>>>> .merge-right.r127158
         </actionGroup>
         <setInstallerVariable name="component(alfresco).parameter(alfresco_rmi_port).ask" value="0">
             <ruleList>
diff --git a/src/main/resources/extract-binaries.xml b/src/main/resources/extract-binaries.xml
index a68bb9f445..2a693deaa1 100644
--- a/src/main/resources/extract-binaries.xml
+++ b/src/main/resources/extract-binaries.xml
@@ -154,6 +154,12 @@
                 <arg value="xf" />
                 <arg value="${maven.localrepo}/org/imagemagick/imagemagick-distribution/${installer.imagemagick.version}/imagemagick-distribution-${installer.imagemagick.version}-@{targetPlatform}.tgz" />
             </exec>
+            
+            <echo>  Extracting Manager...</echo>
+            <exec failonerror="true" executable="tar" dir="${bin.folder}">
+                <arg value="xf" />
+                <arg value="${maven.localrepo}/org/alfresco/manager/${installer.manager.version}/manager-${installer.manager.version}-@{targetPlatform}.tgz" />
+            </exec>
         </sequential>
     </macrodef>