add 2.1.2 docs
resolve a conflict