This instruction seems out-of-place between git checkout and make init. Also, it doesn't explain the purpose for needing to use docker without sudo. It seems like it belongs in a separate section for optional helpful steps.

if one install docker with sudo, and run into 'make init' section, it throws out error which requires to install the docker package. The related script is at line 55 of Makefile.work file. It is at "docker_ver := $(shell docker info)"

This is a command you should only need to run once when you set up your environment. I don't think it belongs in the "Usage" section. I think it would be better in a section below "Prerequisites" (or part of that section), maybe like the following:

## Configure your system to allow running the 'docker' command without 'sudo'
      1. Add current user to the docker group
	 `sudo gpasswd -a ${USER} docker`
      2. Log out and log back in so that your group membership is re-evaluated

This is a command you should only need to run once when you set up your environment. I don't think it belongs in the "Usage" section. I think it would be better in a section below "Prerequisites" (or part of that section), maybe like the following:

## Configure your system to allow running the 'docker' command without 'sudo'
      1. Add current user to the docker group
	 `sudo gpasswd -a ${USER} docker`
      2. Log out and log back in so that your group membership is re-evaluated

Ok. I put it as part of the "Prerequisites" section.
Many thanks.

please fix your merge conflict

Very helpful, avoiding compilation errors