change lnks
after merge