updated index
fix conflicts