Merging first ncurses
Fixing merge conflict
fixing merge conflicts