Fixed edit issue merge