Resolve merge conflicts with MutationObserver

Tyler you dork