manual merge with mark 7/15