fix conflicts
Version 0.8.2 - Office