adding edge cases for conflict detecting and handling

Merge request reports

Loading