receive html
resolve merge conflict
CSS additions to article and image