homepage conflicts resolved