customer chat: fix conflict
customer chat: fix conflict

zammad/zammad,monotek/zammad,zammad/zammad,monotek/zammad,zammad/zammad,monotek/zammad,monotek/zammad,zammad/zammad,zammad/zammad,zammad/zammad,monotek/zammad,monotek/zammad