commit non-sense
Delete non-sense
Merge branch 'mydev'