Fix some merge issues caused by an earlier commit