Validator ready
fixed merge conflict