Somehow there was a conflict left from the previous merge