doc: Remove merge cruft

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>