add conflict resolution to the multiplexer by Stebalien · Pull Request #31 · multiformats/go-multistream