fixing home controller merge conflicts