Clean up merge errors