This will resolve the previous merge conflict