add validation on conflict and feedback page
Merge pull request #151 from if045/IN-tech

add validation on conflict and feedback page