Kangana Ranaut and Javed Akhtar end 5-year long legal feud: ‘He also agreed to write songs for my next directorial’