on live changes
merge