CI Merge Strategy

This is the final flowchart draft for the CI merge strategy