Fix merge and edit issues.