Correct version (conflict solved)