Resolved user.el merge conflict