I have a process that at a certain point uses an inclusive gateway depending on if one branches conditions are satisfied. At the end of the workflow I need to wait for all paths that were taking before ending the workflow. The problem is that if I use a parallel gateway it to merge the paths it waits for all incoming paths regardless if any of them are active. Below is a screenshot:

The above picture is where the inclusive gateway is. So if an ACA is needed it will go up that path. Either way it will always go to the right.

The above picture is what is at the end of the process. From the left is the process that is mentioned above that will always happen. The path coming at the top of the "ACA Employee Type Merge" gateway is coming from the ACA decision in the process above. In the above picture, since the ACA path may not always be coming in, this process would never complete because it will always wait for that path. How do I get around this?