Mahesh Babu and Samantha patch up at Filmfare Awards!