fixing conflicts to merge it