Add language settings
Solve merge conflict, moved files