Retter kode
ret conflict