add binary search
resolve conflic