homepage conflict resolutions