Fix duplicate chat messages after merge!