merge conflicts and link fix.