resolved conflict in House and ViewController