zanata.xml merge=ours