added links to user
updated css
updated merge
updated merge