Clean up merge error and code in general.