Edit item

merging