Merge with live version