libreoffice update error message
resolved conflict