[merge] Minor
1 file changed