diff --git a/git/install_gitlab.md b/git/install_gitlab.md
index 4cc4348..21ed43f 100644
--- a/git/install_gitlab.md
+++ b/git/install_gitlab.md
@@ -7,6 +7,7 @@
 ## install 
 ``` bash
 $ sudo apt-get install curl openssh-server ca-certificates postfix
+<<<<<<< HEAD
 
 $ curl -LJO https://mirrors.tuna.tsinghua.edu.cn/gitlab-ce/ubuntu/pool/trusty/main/g/gitlab-ce/gitlab-ce_9.2.2-ce.0_amd64.deb
 $ dpkg -i gitlab-ce-XXX.deb
@@ -15,5 +16,9 @@ $ curl -sS https://packages.gitlab.com/install/repositories/gitlab/gitlab-ce/scr
 $ sudo apt-get install gitlab-ce
 
 
+=======
+$ curl -LJO https://mirrors.tuna.tsinghua.edu.cn/gitlab-ce/ubuntu/pool/trusty/main/g/gitlab-ce/gitlab-ce_9.2.2-ce.0_amd64.deb
+$ dpkg -i gitlab-ce_9.2.2-ce.0_amd64.deb
+>>>>>>> 39e9cab6f757d960746af30861ce75e9e2ab2d8d
 $ sudo gitlab-ctl reconfigure
 ```
\ No newline at end of file
diff --git a/git/ssh_key.md b/git/ssh_key.md
new file mode 100644
index 0000000..d9d3bd0
--- /dev/null
+++ b/git/ssh_key.md
@@ -0,0 +1,6 @@
+
+# build ssh key
+
+git config --global user.name 'light'
+git config --global user.name '1870499383@qq.com'
+ssh-keygen -t rsa -C '1870499383@qq.com'
\ No newline at end of file
diff --git a/python/command b/python/command
new file mode 100644
index 0000000..39a9971
--- /dev/null
+++ b/python/command
@@ -0,0 +1 @@
+pip install -r requirements.txt
\ No newline at end of file
diff --git a/rabbitmq/install.md b/rabbitmq/install.md
new file mode 100644
index 0000000..3d61013
--- /dev/null
+++ b/rabbitmq/install.md
@@ -0,0 +1,20 @@
+# install
+
+
+``` bash
+sudo nano /etc/apt/source.list
+# add deb http://www.rabbitmq.com/debian/ testing main
+
+wget https://www.rabbitmq.com/rabbitmq-signing-key-public.asc
+sudo apt-key add rabbitmq-signing-key-public.asc
+sudo apt-get update
+sudo apt-get install rabbitmq-server
+rabbitmq-plugins enable rabbitmq_management
+sudo service rabbitmq-server restart
+
+rabbitmqctl add_user admin admin
+rabbitmqctl set_permissions -p / admin ".*" ".*" ".*"
+rabbitmqctl set_user_tags admin administrator
+rabbitmqctl list_users
+
+```
\ No newline at end of file