speling
manual merge