Resolve a merge conflict left-over
Resolve a merge conflict left-over

hurzl/opacclient,opacapp/opacclient,geomcmaster/opacclient,hurzl/opacclient,simon04/opacclient,ruediger-w/opacclient,thesebas/opacclient,geomcmaster/opacclient,hurzl/opacclient,thesebas/opacclient,geomcmaster/opacclient,johan12345/opacclient,thesebas/opacclient,ruediger-w/opacclient,ruediger-w/opacclient,opacapp/opacclient,simon04/opacclient,johan12345/opacclient,opacapp/opacclient,opacapp/opacclient,ruediger-w/opacclient,johan12345/opacclient,ruediger-w/opacclient,simon04/opacclient,opacapp/opacclient,raphaelm/opacclient,raphaelm/opacclient,raphaelm/opacclient,johan12345/opacclient,johan12345/opacclient