Actor Akshay Kumar and filmmaker Farah Khan, who had a fallout during the making of Farah's husband Shirish Kunder's 'Joker', have resolved their differences and patched-up. Both Akshay and Farah were at an event when they came face to face with each other. However, rather than avoiding each other, like they used to do previously, they just hugged and made-up.