merging changes live