Merging live changes