Latest data
Fix conflicts