missed a few conflicts, woopsy

Signed-off-by: matt <mbloomfield87@gmail.com>