refactor properly

Author: adrianspeyer

package.xml

@@ -40,13 +40,7 @@ Version 1.1.6 Refactor tracker
 access to the Piwik iframe***
 
 &lt;p&gt;After install, make sure you clear your cache. Click &lt;strong&gt;&lt;a href="http://www.statstory.com/piwik-ecommerce-extension-for-magento/"&gt;here&lt;/a&gt;&lt;/strong&gt; for more details on how it works and how to install.&lt;/p&gt;</description>
-<<<<<<< HEAD
     <notes>Source code Available at:  https://github.com/adriansonline/Piwik-for-Magento&#xD;
-=======
-    <notes>Piwik Search "No Search" results data in Piwik via noroute&#xD;
-&#xD;
-Source code Available at:  https://github.com/adrianspeyer/Piwik-for-Magento&#xD;
->>>>>>> origin/master
 &#xD;
 </notes>
     <authors><author><name>Adrian Speyer</name><user>AdrianSpeyer</user><email>[email protected]</email></author></authors>
@@ -55,4 +49,4 @@ Source code Available at:  https://github.com/adrianspeyer/Piwik-for-Magento&#xD
     <contents><target name="mage"><dir name="."><dir name="app"><dir name="code"><dir name="community"><dir name="PiwikMage"><dir name="PiwikAnalytics"><dir><dir name="Block"><file name="Piwik.php" hash="4b2f693ca11afead15b4325899b492f6"/></dir><dir name="Helper"><file name="Data.php" hash="4a7b01ffa40694a72cf41629e5d73a9c"/></dir><dir name="Model"><file name="Observer.php" hash="75cd8c7cfe2db518885e1ddc5ba8a7c0"/></dir><dir name="controllers"><file name="IndexController.php" hash="c1ec8d1e999e79891c3cdfe3dbacf8a7"/></dir><dir name="etc"><file name="adminhtml.xml" hash="01c60c66677b73280d496db67b29cd88"/><file name="config.xml" hash="975b4ccefa07d612faa42b41fe43341a"/><file name="system.xml" hash="01cf335469570e7b08e69964d88e3b7d"/></dir></dir></dir></dir></dir></dir><dir name="design"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="piwikanalytics"><file name="piwik.phtml" hash="61e1b1660d06392fa319c6480eef7acc"/></dir></dir><dir name="layout"><file name="piwikanalytics.xml" hash="0ecc6b445f0457ccec40259fee63c348"/></dir></dir></dir></dir></dir><dir name="etc"><dir name="modules"><file name="PiwikMage_PiwikAnalytics.xml" hash="0712342b3649d899fc2f773c4cd10875"/></dir></dir><dir name="locale"><dir name="en_US"><file name="PiwikMage_PiwikAnalytics.csv" hash="1d58be97f37a234562d96d603bac7d21"/></dir><dir name="de_DE"><file name="PiwikMage_PiwikAnalytics.csv" hash="e6df4880421a60c4aa42d3ca95de0618"/></dir></dir></dir></dir></target></contents>
     <compatible/>
     <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
-</package>
+</package>