Remove errant line left over from merge conflict