On edit record all field validations implemented
Merge conflict resolved