diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..1211f0b
Binary files /dev/null and b/.DS_Store differ
diff --git a/.arquivo2.txt b/.arquivo2.txt
new file mode 100644
index 0000000..4c52cf6
--- /dev/null
+++ b/.arquivo2.txt
@@ -0,0 +1 @@
+ola, tudo bem?
diff --git a/.nova/Configuration.json b/.nova/Configuration.json
new file mode 100644
index 0000000..78e6a39
--- /dev/null
+++ b/.nova/Configuration.json
@@ -0,0 +1,3 @@
+{
+  "workspace.name" : "git"
+}
diff --git a/arquivo.txt b/arquivo.txt
index 49cc8ef..80dc915 100644
Binary files a/arquivo.txt and b/arquivo.txt differ
diff --git a/arquivo2.txt b/arquivo2.txt
index cface28..80dc915 100644
Binary files a/arquivo2.txt and b/arquivo2.txt differ
diff --git a/arquivo_remoto.txt b/arquivo_remoto.txt
new file mode 100644
index 0000000..72ec7fb
--- /dev/null
+++ b/arquivo_remoto.txt
@@ -0,0 +1 @@
+Olá git
diff --git a/changelog.md b/changelog.md
new file mode 100644
index 0000000..ffd01ca
--- /dev/null
+++ b/changelog.md
@@ -0,0 +1,14 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.0.1] - 2014-05-31
+
+### Added
+
+- Added arquivo.txt & arquivo2.txt
diff --git a/conflito.txt b/conflito.txt
new file mode 100644
index 0000000..f32656b
--- /dev/null
+++ b/conflito.txt
@@ -0,0 +1,10 @@
+<<<<<<< HEAD
+olá, tudo bem?
+=======
+olá, tudo bem?
+<<<<<<< HEAD
+
+paragrafo novo
+=======
+>>>>>>> origin/main
+>>>>>>> main
diff --git a/github.txt b/github.txt
new file mode 100644
index 0000000..62ae8e6
--- /dev/null
+++ b/github.txt
@@ -0,0 +1 @@
+olá github
diff --git a/new_file.txt b/new_file.txt
index 87df118..cf63fb8 100644
Binary files a/new_file.txt and b/new_file.txt differ
diff --git a/teste.txt b/teste.txt
index 0bb4673..4734ad1 100644
Binary files a/teste.txt and b/teste.txt differ