automated creation of users/asolkar.json
Resolved merge conflict