some dependencies removed, merge script fixed

Vivide-mt.377