New branch for distinction

Author: jonesiscoding

composer.json

@@ -8,13 +8,12 @@
     "name": "William Durand",
     "email": "william.durand1@gmail.com"
   }],
-
   "autoload": {
     "psr-4": { "Propel\\Bundle\\PropelBundle\\": "" },
     "files": ["autoload_aliases.php"],
     "exclude-from-classmap": [ "Tests/" ]
   },
-
+  "version": "1.7",
   "require": {
     "symfony/framework-bundle": "^3.0.2",
     "palepurple/propel1": "^1.7"
@@ -26,15 +25,13 @@
     "sensio/framework-extra-bundle": "^3.0.2",
     "fzaninotto/faker": "^1.5"
   },
-
   "conflict": {
     "symfony/propel1-bridge": ">=2.8.0"
   },
-
   "replace": {
-    "symfony/propel1-bridge": "<=2.8.0"
+    "symfony/propel1-bridge": "<=2.8.0",
+    "propel/PropelBundle": "^1.6"
   },
-
   "suggest": {
     "propel/propel-acl-bundle": "For using the Propel ACL implementation"
   }