"... In PAGE 14: ... It is evident that it is desir- able to have as many conflicts as possible resolved by the first and second step, while the fifth step should never be required. Table3 shows for each program the number of basic blocks in the initial control flow graphs (column Initial Blocks) and the number of basic blocks in the control flow graphs after the conflict resolution phase (column Final Blocks). In addition, the number of basic blocks that were removed in each of the five steps of the con- flict resolution phase are shown.... In PAGE 14: ... In addition, the number of basic blocks that were removed in each of the five steps of the con- flict resolution phase are shown. The numbers given in Table3 were collected when the tool-specific modifica- tion was enabled. The results were very similar when only general techniques were used.... ..."

"... In PAGE 14: ... It is evident that it is desir- able to have as many conflicts as possible resolved by the first and second step, while the fifth step should never be required. Table3 shows for each program the number of basic blocks in the initial control flow graphs (column Initial Blocks) and the number of basic blocks in the control flow graphs after the conflict resolution phase (column Final Blocks). In addition, the number of basic blocks that were removed in each of the five steps of the con- flict resolution phase are shown.... In PAGE 14: ... In addition, the number of basic blocks that were removed in each of the five steps of the con- flict resolution phase are shown. The numbers given in Table3 were collected when the tool-specific modifica- tion was enabled. The results were very similar when only general techniques were used.... ..."

"... In PAGE 5: ... For instance the sequence GM means that a smooth integration (G) was followed by a commit (M). Table11 shows the results for the following categories: Changes were committed. The sequences GM or CM in- dicate that the integrated changes were committed to the repository.... ..."

"... In PAGE 17: ... SMIS INRIA Sibling conflicts arise when two different rules, targeting the same ancestor-descendant relationship, exhibit two different Sibling decorrelations. Table4 summarizes all possible combinations of Sibling for these two rules and their associated conflict resolution. Again, the proposed conflict resolution being commutative, operand1 and operand2 represent either the Sibling parameter of RA1 or RA2 and the conflict resolution is done in accordance with the least privilege principle.... ..."

"... In PAGE 28: ...4.1 Conflict Resolution Methods Table7 summarizes conflict resolution methods found in the requirements engineering related lit- erature. The six categories were derived from approximately 29 methods mentioned in the litera- ture, of which approximately 11 unique methods were identified.... ..."

"... In PAGE 4: ... For example, closures involving caption and hint assignments may include many of the elements on a page. Instead, we perform a greedy search to resolve the conflict, as shown in Table3 . At each step, the resolution algorithm selects the fact from the closure with the highest score, removes it and its alternatives from the closure, then repeats until the conflict closure is exhausted.... ..."

"... In PAGE 4: ... For example, closures involving caption and hint assignments may include many of the elements on a page. Instead, we perform a greedy search to resolve the conflict, as shown in Table3 . At each step, the resolution algorithm selects the fact from the closure with the highest score, removes it and its alternatives from the closure, then repeats until the conflict closure is exhausted.... ..."