Glömt commita tidigare
fixed a conflict with my self?