added timepicker to create user
fixed merge conflict