add another index??
resolved conflicts