working
fixed merge
added link to user profiles