diff --git a/env.txt b/env.txt
new file mode 100644
index 0000000..8e36d5b
--- /dev/null
+++ b/env.txt
@@ -0,0 +1,2 @@
+Fix conflict
+New env
diff --git a/readme.txt b/readme.txt
index a9c5755..341549a 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,4 +1,5 @@
 Git is a distributed version control system.
-Git is free software distributed under the GPL.
+Git is a free software.
 Git has a mutable index called stage.
-Git tracks changes of files.
+Git tracks changes.
+Git add merge.
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://github.com/SyskeyDemon/LearnGit/compare/master...dev.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://github.com/SyskeyDemon/LearnGit/compare/master...dev.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>