added IGP links, resolved merge artifact

Man, I really need to brush up on my git-mergetool skills.