gj Reedy. Remove merge conflict

Change-Id: If3bf3722e956b44052f987723552bc44ba131cdf