fix merge conflict

Author: zane

readme.adoc

@@ -94,3 +94,8 @@ kubectl delete -f configs/aws-service-operator.yaml
 == Developer Docs
 
 [Here](development.adoc)
+
+= FAQ
+
+What is the difference between aws-service-operator (this project) and link:https://github.com/awslabs/aws-servicebroker[aws-servicebroker]?::
+  The operator approach is based on an active component that can react to changes and eventually will also support day 2 operations. See link:https://github.com/awslabs/aws-service-operator/issues/137[Issue #137] for more details, pull requests are most welcome.