first commit
fixed conflictå