add localwiki gem
use localwiki_client
fix merge conflict oopsies