Fixed extant merge conflict