remove a small snafu

with a merge conflict