olvir white hair

Having trouble with the Olvir white hair quest. The one where you "mother" is transferred to you but "she" is a man, In Ulfs farmstead. You fight. In the previous playthrough I did (Didn't finish due to complications regarding everyone hating me cus I raided a monastery) it skipped the fighting...