fixed merge issues also other stuff with looping index cards in progress