Adding validation to conflict form, in progress