home page complete
conflict resolve