4:12 PM index sync
6:15pm sync
merge fix
merge fix