I failed with Edwin :(

Well i talked with edwin before rescuing dynaheir.

I went with Edwin and minsc to rescue her and it turned a mortal combat scene or Edwin leaving.

So i reloaded a previous game, i left Edwin in the INN and i rescued Dynaheir.

But now if i join Edwin again the kill quest is still active and when the time passes he quits me.

Any way to get him back? i rly like him <3