resolve conflict but bug unfixed yet