fixed merge conflict, added verbose mode