fix ctrl+D to quit
resolve conflicts