fix#1
fix#2
changed merge_with action to redirect to "edit"