https://jml.io/posts/merging-new-trunk-features-to/