merge in non scaffolded parts of user