Update public links
Fix merge