Retter properties i model
Retter merge conflict