fix edit post bug
fix post conflicts