) have changed from the base [...] all colliding changes [...] . All changes with a conflict

or variables in a variable [...] constants or variables [...] over multiple global variable

) have changed from the base [...] when they are changed locally Marker [...] or variables for the project