Fix build (merge fail)