minor changes to our client
what merge conflict