Fix build, finish conflict merge.