Fixed wonky merge error