Address two missed conflicts that broke build