change to home from release2
resolved conflict 2