check refactor after fixing conflicts