I didn't mean merging with every release, just wondering if we should merge only of something stops working on our side (like last time), or proactively, more frequently, to avoid big-bang merging. I guess we can agree to merge every major release (1.5, 1.6) as a trade-off, now we should focus on delivering some MVP 😄