Clean up compile errors after merge