I try to resolve conflict but it seems to be fine