Revert "2nd attempt to fix conflicts"

This reverts commit 9cb3da3.

Author: jonesiscoding

composer.json

@@ -39,7 +39,7 @@
     "symfony/propel1-bridge": ">=2.8.0"
   },
   "replace": {
-    "symfony/propel1-bridge": ">=2.8.0"
+    "propel/propel-bundle": "1.6.x-dev"
   },
   "suggest": {
     "propel/propel-acl-bundle": "For using the Propel ACL implementation"