Fix merge/conflict error.