merge+misc