resolved merged conflict
resolved merged conflict

maxhutch/libxsmm,hfp/libxsmm,egeor/libxsmm,maxhutch/libxsmm,hfp/libxsmm,egeor/libxsmm,egeor/libxsmm,hfp/libxsmm,egeor/libxsmm,hfp/libxsmm,egeor/libxsmm,maxhutch/libxsmm,egeor/libxsmm,hfp/libxsmm,maxhutch/libxsmm,hfp/libxsmm