Update work glossary file
resolve conflict