Fix memory_tracking.hpp

Author: michalowski-arm

src/common/memory_tracking.hpp

@@ -242,13 +242,10 @@ enum {
     key_lnorm_tmp_diff_ss,
     key_lnorm_reduction,
     key_matmul_dst_in_acc_dt,
-<<<<<<< HEAD
-=======
     key_matmul_src_trans,
     key_matmul_wei_trans,
     key_matmul_dst_trans,
     key_matmul_dst_cast_acc,
->>>>>>> ff8b2208b7 (src: cpu: aarch64: enable general sum post-op in lowp_matmul)
     key_pool_dst_bf16cvt,
     key_pool_dst_plain2blocked_cvt,
     key_pool_ind_plain2blocked_cvt,