settled merge conflicts with index thumb divs