fixed merge stuff and made a link