add links for project websites
manage merge conflicts