merge with live