CHanged env file and added current user validation to index
Resolved merge conflicts