Fixed merge conflicts for Poppy