Fix Sonnar issues
Fix conflicts