add /usr/bin/env-tai
conflict fixed