Manual merge of poop mechanic into bird