Could you separate the fix from your development branch to a branch on its own that can be trivially merged?
Could you separate the fix from your development branch to a branch on its own that can be trivially merged?