Made ConfirmDialog definition more consistant
Fixed conflicts