Fix merge conflict from origin master.