changed favicon filename to fix non-displaying favicon icon
resolved merge conflict