properly check for defined extbang
fix conflicts