diff --git a/README.md b/README.md
index ccf7f9b..07d4ece 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
-# OpenToonz
+# OpenToonz ([日本語](./doc/README_ja.md))
+
+## What is OpenToonz?
 
 OpenToonz is a 2D animation suite published by 
 [DWANGO](http://dwango.co.jp/english/). It is based on **Toonz Studio
@@ -6,24 +8,27 @@ Ghibli Version**, originally developed in Italy by
 [Digital Video, Inc.](http://www.toonz.com/), and customized by
 [Studio Ghibli](http://www.ghibli.jp/) over many years of production.
 
-## Operating details
+## Program Requirements
 
 Please refer to the OpenToonz site at <https://opentoonz.github.io>.
 
-## Packaged installers
+## Installation
 
-Please download and install OpenToonz from the installers at
-<https://opentoonz.github.io>.
+Please download and install OpenToonz from the installers at <https://opentoonz.github.io>.
 
-## Building from source
+## How to Build Locally
 
--   [Windows](how_to_build_win.md) (jp)
--   [OS X](how_to_build_macosx.md) (jp)
+- [Windows](./doc/how_to_build_win.md)
+- [OS X](./doc/how_to_build_macosx.md)
 
 ## Licensing
 
--   Files other than the `thirdparty` directory
-    -   Provided under a [modified BSD license](LICENSE.txt).
--   Files in the `thirdparty` directory
-    -   Follow the licenses described in the README and source code of each
-        third-party component's directory.
+- Files outside of the `thirdparty` directory are based on the Modified BSD License.
+  - [modified BSD license](./LICENSE.txt).
+  - Based on this license, this software may be used or changed freely for business or personal use.
+- For files in the `thirdparty` directory:
+  - Please consult with the licenses in the appropriate READMEs or source codes.
+
+### Special Thanks
+
+This Open Source Program is developed from Toonz, a software originally created by Digital Video, S.p.A., Rome Italy
diff --git a/doc/README_ja.md b/doc/README_ja.md
index 914d4a2..e6438a0 100644
--- a/doc/README_ja.md
+++ b/doc/README_ja.md
@@ -1,12 +1,9 @@
-[English Instructions](#english)
-# OpenToonz
+# OpenToonz ([English](../README.md))
 
 ## これは何？
 
-- [English README](README.en.md)
-
-2Dアニメーション制作ソフトウェアです。
-イタリアのDigital Video社が開発し、株式会社スタジオジブリのカスタマイズを経て、ジブリ作品の制作に長年使われてきたソフトウェア「Toonz」が基になっています。
+2D アニメーション制作ソフトウェアです。
+イタリアの Digital Video 社が開発し、株式会社スタジオジブリのカスタマイズを経て、ジブリ作品の制作に長年使われてきたソフトウェア `Toonz` が基になっています。
 
 ## 動作条件
 
@@ -18,46 +15,16 @@ https://opentoonz.github.io/ から最新版のインストーラーをダウン
 
 ## ビルド方法
 
-- [Windows](how_to_build_win.md)
-- [OS X](how_to_build_macosx.md)
+- [Windows](./how_to_build_win_ja.md)
+- [OS X](./how_to_build_macosx_ja.md)
 
 ### ライセンス
 
-- thirdpartyディレクトリ以外のファイル
-  - [修正BSDライセンス](LICENSE.txt)
+- thirdparty ディレクトリ以外のファイル
+  - [修正 BSD ライセンス](LICENSE.txt)
   - ライセンスに基づき、商用・非商用問わず、自由にソフトウェアの利用やソースコードの改変ができます
-- thirdpartyディレクトリ内のファイル
-  - 各ディレクトリ内のREADMEやソースコードに記載されたライセンスに従ってください
+- thirdparty ディレクトリ内のファイル
+  - 各ディレクトリ内の README やソースコードに記載されたライセンスに従ってください
 
-<<<<<<< HEAD
 ### Special Thanks
 This Open Source Program is developed from Toonz, a software originally created by Digital Video, S.p.A., Rome Italy
-=======
-# English
-
-## What is OpenToonz?
-
-OpenToonz is a program for 2D animation production.
-It is based on the program "Toonz", which was originally developed by the Italian company Digitial Video, and later modified by Studio Ghibli for use in their films throughout the years.
-
-## Program Requirements
-
-Please check out https://opentoonz.github.io/
-
-## Installation
-
-Download and install the latest binaries from https://opentoonz.github.io/ 
-
-## How to Build Locally
-
-- [Windows](how_to_build_win_en.md)
-- [OS X](how_to_build_macosx_en.md)
-
-### License
-
-- Files outside of the "thirdparty" directory are based on the Modified BSD License.
-  - [Modified BSD License](LICENSE.txt)
-  - Based on this license, this software may be used or changed freely for business or personal use.
-- For files in the "thirdparty" directory:
-  - Please consult with the licenses in the appropriate READMEs or source codes.
->>>>>>> 7c38905d3c2881844f78eb48ef0fe057ab156700