To "conflate" is when two or more things are merged into one.

In tech we usually assume "confluence" means the Atlassian product, not "a merging of several items".