Improved edit issue merge