added check that the terminal is running in interactive mode
merge commit conflict