fix non-fixed merge (thx pol)