resolve conflict
removing homepage code
fixed conflicts
basic homepage layout