fixed merge conflicts for watcardoffice