Install nvillage search module
Fix merge conflict