fixed a merge problem in post