Fixes Merge issue, reinstates TextDisplay