fixed merge bugs in Mekkah Flood scenario