Modify post
Fix conflict