3 updates by default
Fix conflicts