add language to README
fix conflict