working on index
merging confilcts
conflicts merged