Removed conflicts from index controlle