Fixed nCurses merge conflict