remove forgotten merge conflict lang