correc before merge