made a page
new site made
fixed conflicts