Don't reset the branch, fix bug in combo type