fix compile problem 2 (self-merging)