Fixing all the merge issues and a minor bug in getCurrentUsr