Since you are on stable version right now, changes are you will eventually get marshmallow stable. But that can take weeks. Please read the OP of last week's weekly update to see how to merge partitions. This is only if you are willing to abandon stable and use weekly version.