Debugging index

fixing errors resulting from merge