updating transltations after merging master