Pink has insisted that her feud with Christina Aguilera has been "resolved" more than 20 years after they famously fell out when recording 'Lady Marmalade' together.