diff with old version should not be mixed