removed some conflict markers left over from upstream merge with my repo
removed some conflict markers left over from upstream merge with my repo

MindTouch/NServiceKit.Redis,NServiceKit/NServiceKit.Redis,nataren/NServiceKit.Redis