not sure what is causing this conflict however you can remote this file it is irrelevant
[ Full content available at: https://github.com/apache/incubator-openwhisk-runtime-go/pull/47 ] This message was relayed via gitbox.apache.org for [email protected]
