You can remove this inline comment and the block comment above it.  I think they were added back in when you merged.