Fix build error due to missed merge conflict