Merge from remote, stripping content to demo