mahmoud-adam85 Resolve conflicts after merging with firefox v12.x