Fix merge-related compile issues