Fix merge on envrc