merge original and thrust back into one branch