in-progrss with live merges
doc bump