fix on wrong merrge
BASH
Merge branch 'lt1' of https://github.com/teamdiamond/qtlab into lt1