Resolve of conflicts and update of testComputeDialog.