minor string adjustment
fixed binary conflict replacment not confirmed