add validation on conflict and feedback page