solving UI merge
solving index merge with UI and angular changes