Cleaned up merge notes