I suppose the better thing would be to use r-win's release as unique/stable/default release - and then implement the other stuff in it if possible, if not, well, too bad for the other stuff.
I mean having so many different branches on the same project is just chaotic.
My two cents.