fix index
merge
mere
fix merge