??
Solved conflict
Added article placeholder for homepage