Today we have released many updates and stability enhancements for the Advanced Conflict merge tool for Siemens Step7 TIA Portal.  We have also enhanced the documentation to better explain the scope and limitations of this advanced feature.  The video below summarizes this advanced feature!