merge_user.py fixed

submitted on behalf of @MaxKellermann for Travis testing