nicer death for megaman now
conflict fixes