On the 1-2-3-conjecture