³Conflicts are normally related to content conflicts, however there is another kind of conflict, tree conflcts, that we will talk about later