BUG-7505: Conflict Modification