Delete zen
delete omega
Merge branch 'test'