extra: estate: move merge_estate() from extra to estate