Remove explicit reference usage
fix merge conflict