Try
Merge branch 'edit'