Fixed mistakes from previous merge conflict