resolved getch and rebase