fixed previous merge conflict error