Merge with ooo dictionary development