merge with online version