[Fix] Remove diff from corrupted merge