Switched special combos to either combo split first or second window (use the shift shortcut, e.g. mod+Shift+z) to combine window with previous window.