No merge conflicts in this house.