corrected ugly merge comment

Signed-off-by: RJ McCollam <rj@wedodev.com>