Fixed conflicts from previous merge