manually merged language branch