Fix the merged build