make link dummy
fix merge conflict