Conflicts are part of everyday life in software development, for example when teams work together on a system. A new DFG project at BTU Cottbus-Senftenberg and Philipps-Universität Marburg is now researching a proactive approach that not only recognises conflicts, but also specifically prevents them.