completed merge, created online version.