MDL-40424 libraries: Removed missed conflict marker