index fixed after bad merge