Fix merge conflict for b3ad4d8