Add post theme
Update theme
Resolve conflicts