Modify a little for a better deployment.
Resolve merge conflict.