Merge edit and create