Remove conflict notation.

Remove conflict notation accidentally left in the lib.