Airbyte is an open-source data integration engine that helps you consolidate your data in your data warehouses, lakes and databases.

Airbyte

<@U02ET60RRC6>
can you please fix this
<https://github.com/airbytehq/airbyte/blob/103c224eccc47685cece315fde8ce890108e9144/airbyte-integrations/connectors/destination-snowflake/src/test/java/io/airbyte/integrations/destination/snowflake/SnowflakeDestinationTest.java#L21|https://github.com/airbytehq/airbyte/blob/103c224eccc47685cece315fde8ce890108e9144[…]ntegrations/destination/snowflake/SnowflakeDestinationTest.java>

<@U02HVBTGGSK> having some trouble understanding the changeset here can you help out <https://github.com/airbytehq/airbyte/pull/9528>

The file in question should be fixed but the rest of the commits should already be in master from a merge yesterday unless they were reverted?

Okay I refreshed the fork copy and the PR looks a little bit more readable now please review when you have time

I am about ‘&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD’

in master branch I can see not fixed merge conflict

```cat ./airbyte-integrations/connectors/destination-snowflake/src/test/java/io/airbyte/integrations/destination/snowflake/SnowflakeDestinationTest.java

import io.airbyte.integrations.base.Destination;
&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
import io.airbyte.protocol.models.AirbyteMessage;
import io.airbyte.protocol.models.AirbyteRecordMessage;
import io.airbyte.protocol.models.CatalogHelpers;
import io.airbyte.protocol.models.ConfiguredAirbyteCatalog;
import io.airbyte.protocol.models.DestinationSyncMode;
import io.airbyte.protocol.models.Field;
import io.airbyte.protocol.models.JsonSchemaPrimitive;
=======
import io.airbyte.protocol.models.*;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;

&gt;&gt;&gt;&gt;&gt;&gt;&gt; master
import java.nio.file.Path;```

I see you commited new source-hellobaton connector
and I am not sure why you changed this file “SnowflakeDestinationTest.java” at all

maybe some java code formatter touched it

if you changed this file “SnowflakeDestinationTest.java” by an accident
you can recover this file “SnowflakeDestinationTest.java”
( just  restore a copy of this file as if you not touched it at all )

I had no reason to even go in that directory

Restore to what state though? The commits in my forked copy of airbyte aren't the same as the master branch

Regardless those are just import statements so the PR I have up for your review just removes the git merge conflict syntax and doesn't make any choices about which java libraries should be imported. If checks pass then merge if not then maybe ask for the review of the contributor of that file who knows which libraries should be imported

yeah it seems this commit is the reason
<https://github.com/airbytehq/airbyte/pull/8461/commits/3dcef4b12f85f3be60725ef36495c74a7b0b9ceb>

<@U02HVBTGGSK> I made the confusion when dealing with conflict helping Daniel