merge hotfix (authkey from file)