bugfix: fix output is dir
resolve conflict