fix broken index mother fucker
merge and fix conflicts