I had to do this
pulled to desktop, fixed merge fail