add conflict marker pair