added home controller
resolved conflicts