Fix merge issue on master.
1 file changed