fix web-loader, bad conflict resolution
remake browserfiles