fixed merge marks.