update RHouse & doing RSeat
update RHouse and RSeat
handle merge conflict