merge in live changes by eric