Fixed index entry
Clean up
Fixed merge conflict