Properly mergin languages
Added year information