Hi Vojtech, it seems that foreach rebase I do I get git conflicts for constants files (java iface localization files). do you have a way to solve that? Thanks, Gilad.