fix bug home
conflict