fix the post list list. don't want our new bullets there. BANG.
fix some conflict lines.