Update info
Fix conflicts