merge new stuff