mistypes
Fix merge conflict.
Merge branch 'lagleki-patch-1'