Fixed merge language bug