Added the awesome command 'normal' to the doc.
Fix merge conflict.