Ok, I pulled and got the conflicts ;-) Looks familiar and where I expected them. I'll resolve and create a remote realtime branch in my fork, then you can take a look.