Resolve merge conflict on post.html