Merging local with online