revert deep merge to keep things cleaner