manual merge
working on index