left out stuff from previous merge conflict