Neymar and Cavani train together after penalty row