Fixed wonky merge.