Edit komid i lag
Merge branch 'edit-branch'