Fix some lingering merge issues.

Signed-off-by: Aron Cedercrantz <aron@cedercrantz.se>