corrected error during merge