Which correctly identifies the connection between peasants and serfs?

1. Serfs worked in the manor house, and peasants worked on the land.
2. Most peasants were also serfs