xcontext: resolve a merge conflict
xcontext: resolve a merge conflict

bpowers/DoubleTake,plasma-umass/DoubleTake,plasma-umass/DoubleTake,plasma-umass/DoubleTake,bpowers/DoubleTake,plasma-umass/DoubleTake,bpowers/DoubleTake,plasma-umass/DoubleTake,bpowers/DoubleTake,bpowers/DoubleTake,bpowers/DoubleTake,plasma-umass/DoubleTake,plasma-umass/DoubleTake,bpowers/DoubleTake,bpowers/DoubleTake