It's safe to merge now. I'm going to change the default speed from 1000 bps to standard 1200 and it's multiplies 2400, 4800, ... but it may take a while, you should merge it now, so our versions won't drift apart too much