fix left-over from merge conflict