change language to

more speculative than fact, but at least it makes some sense
replace same file to resolve conflicts