Code

Merge branch 'js/merge-edit-option'