merge sven-ola's tree