Fixed merge conflicts and error with links