core: fix memleak in IfConditionExpression (it need a design change to be correctly handled)
core: fix merge