merging changes to website