Fixed post bugs
Merge conflict resolution