add links and remove merge error message