updated index
removed conflicts