Switch to name error
Remove deep_merge dependancy