favicon added
conflict mergerd