-  fix merge
- update to latest version of Glimpse