merge develop into a now blank and disconnected master

Question

the title is confusing but here is what happend. INitially master was created; then develop-ms1 was created out of it. But then either of them was "reset" completely b