corrected own merge error