fix merge conflicts, modify links