add yml attention
Merge branches 'hip' and 'master'