fix autoMerge conflict in OfficeController