1ff685488e
The force-merge procedure was documented twice, neither one complete. Combine them. Change-Id: If4350a0a90d455b64227befde2f1be7475ac8120