Development merge correction