Merge with online version