fix some merge probs

Add address to the website