Add Man plugin
Fix merge conflict