fix a few issues after test
remove key
merge remote