Barcelona and Neymar have ended their long-running legal dispute