Merge edit and delete feature inside master