'New Code' on feature branch being polluted with details from mainline