well that was a silly merge