fix screen xterm-256color for 256 colours
fix merge conflicts