rollback api key
conflict resolved