What’s the difference between a manor and a estate

Prior to the abolution of feudalism, a manor had quasi-judicial authority (as in a manorial court), whereas an estate doesn’t. They both refer to the collection of land and buildings on that land.