Merge tolk changes