Fixed a merge miss that occurred from conflict.
Fixed a merge miss that occurred from conflict.

ARTED/ARTED,ARTED/ARTED,ARTED/ARTED,yhirokawa/ARTED,yhirokawa/ARTED,yhirokawa/ARTED,ARTED/ARTED,yhirokawa/ARTED