It's now `user_displayname` and not `displayname` - that's why we have a merge conflict here. Please rebase!