fix links
merging