Hi all,we were working on two different feature branches an now run into some problems merging the Designers project file (*.touchgfx).Merging the graphical parts worked out well, but when it comes to texts, merging is not possible that easy.Especial...