fixed main page
fixed merge conflicts