merge code
edit and delete issue