initial structure
manual merge