nya objekt :D
fixed conflicts