Removed language settings
Resolved merge conflicts from origin