Chinese conflicts resolved
Arabic fixes