manual merge

- manually included the new screen manager