Remove duplicate entry due to mismerge and incomplete resolution.
1 file changed