Corrected incomplete merge