fixing previous merge conflict