remove mistaken merge result file

Signed-off-by: Matthew McNew <mmcnew@pivotallabs.com>