merge website updates