updated repo refs to browser-diet
fix conflicts