Bug on jedha

After i met up with merrin there should be 2 stormtroopers and a big robot with a electro staff(not magnaguard it looks somewhat like an inquisitor) but they just dont appear and i can hear stormtroopers voices also the merrins rebuild feature doesnt appear too(i assume it will appear after i beat these guys). Please help me