added .envrc locally
Deal with merge
Resolved envrc conflict