Validation added fixed git merge conflicts