Fix conflicts between &modifiable and :edit

Close issue #323.