Attempt to fix the merged build