stashing
Fix index mergin