Fix broken merge
Fix broken merge

jotes/pontoon,participedia/pontoon,mozilla/pontoon,mozilla/pontoon,participedia/pontoon,sudheesh001/pontoon,mozilla/pontoon,participedia/pontoon,mastizada/pontoon,mozilla/pontoon,mastizada/pontoon,mozilla/pontoon,jotes/pontoon,mastizada/pontoon,sudheesh001/pontoon,participedia/pontoon,jotes/pontoon,mastizada/pontoon,mathjazz/pontoon,jotes/pontoon,sudheesh001/pontoon,mathjazz/pontoon,mathjazz/pontoon,sudheesh001/pontoon,mathjazz/pontoon,mathjazz/pontoon