Who killed his father? I thought he offed himself in the boat. Or do you mean Merlyn/The Undertaking via sabotaging the Queen's Gambit and forcing the situation where Oliver's dad killed himself?

I'm confused. A lot of people claim that she gave him a gun, but I just rewatched the episode and missed that transfer of ordinance. When did this supposed gun swap happen?