mismerge: machine became remote

Signed-off-by: Dan Mick <dan.mick@inktank.com>