fixed links
merged