resolve merge conflict

1 job for !1623 with 6292-goaccess-db-retention in 8 minutes and 32 seconds (queued for 9 seconds)
latest merge request