Fix merge conflict build break