changed lines 2 and 4
I solved the coflict