login is stored
resolve merge conf