composer lock
resolved conflicts in composer.lock file
composer file
Admin form validation added.