Import password fix from kex, fix unresolved merge