Ooops! REALLY fix merge conflict