This has recently been added as `user`, which I suspect is the cause of your merge conflicts