Hang the puppet
Fix conflicts
Fix conflicts again