Allen and Winehouse kiss and make up

Pop rivals Lily Allen and Amy Winehouse have ended their bitter feud after coming together at the South by Southwest festival in Austin, Texas.

The pair have battled through the pages of British newspapers over recent weeks, with Allen attacking Winehouse's heavy partying.