Add resource to about.html
Resolve conflicts