added a few language changes
added merge confclit