fixing conflicts
Fixed Footer + blog-info fields