fix post twitter 500 error,ul,ol style change
fix  fix conflicts and then commit the result