index changes
removed conflicts