Fix merge failures

My handling of merge conflicts when commiting my last slew of commits
was quite imperfect, and I left behind both the original and patched
lines in a couple of cases.

Signed-off-by: Robin Sonefors <robin.sonefors@op5.com>