added poopoo comment
fixed conflicts about poopoo