changes to adding post
fixing conflict
fixing conflict