You still have a change here - could you remove it to avoid conflicts during rebases?

Also, if you can make the commit message a bit more explicit it would be helpful - like "mattdrayer/CLIENT-932: API - Adds edition of User data" maybe? Thanks for the squashing and for including the branch name btw : )