Fixed Post and Reply

Fixd
Fixed Conflict

Magic