A Systematic Comparison Of Two Refactoring-Aware Merging Techniques