extra var dumps
Fix conflicts