CONN-1025 Issue after merge with conflict and login display