add assertion for merging
Merge branch 'master' of github.com:wenzhuman/fonttools